More box<>grid comparison tests

Add a more complicated case with multiple expanding children.
Also, make the window a popup.

diff --git a/tests/reftests/box-packing.ref.ui b/tests/reftests/box-packing.ref.ui
index 50210493347e56e299b21879cff77c8a3d261832..32aa383084987349bd031e5b3998bcef2e5aa4e2 100644 (file)
--- a/tests/reftests/box-packing.ref.ui
+++ b/tests/reftests/box-packing.ref.ui
@@ -2,8 +2,9 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
+    <property name="type">popup</property>
     <property name="can_focus">False</property>
-    <property name="default_width">200</property>
+    <property name="default_width">320</property>
     <property name="default_height">320</property>
     <child>
       <object class="GtkBox" id="box1">
@@ -337,6 +338,95 @@
             <property name="position">4</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box11">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">horizontal</property>
+            <child>
+              <object class="GtkEventBox" id="eventbox17">
+                <property name="name">red</property>
+                <property name="width_request">10</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox18">
+                <property name="name">green</property>
+                <property name="width_request">10</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox19">
+                <property name="name">red</property>
+                <property name="width_request">20</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox20">
+                <property name="name">green</property>
+                <property name="width_request">20</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox21">
+                <property name="name">red</property>
+                <property name="width_request">40</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox22">
+                <property name="name">green</property>
+                <property name="width_request">40</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>

diff --git a/tests/reftests/box-packing.ui b/tests/reftests/box-packing.ui
index 9dda60b57394a5a85bd8b561990b677bdce275c2..3dac61a598bb51a61fcfebb6e190ab053877141b 100644 (file)
--- a/tests/reftests/box-packing.ui
+++ b/tests/reftests/box-packing.ui
@@ -2,8 +2,9 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
+     <property name="type">popup</property>
     <property name="can_focus">False</property>
-    <property name="default_width">200</property>
+    <property name="default_width">320</property>
     <property name="default_height">320</property>
     <child>
       <object class="GtkBox" id="box1">
@@ -359,6 +360,109 @@
             <property name="position">4</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkGrid" id="grid9">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkEventBox" id="eventbox17">
+                <property name="name">red</property>
+                <property name="width_request">10</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox18">
+                <property name="name">green</property>
+                <property name="width_request">10</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox19">
+                <property name="name">red</property>
+                <property name="width_request">20</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox20">
+                <property name="name">green</property>
+                <property name="width_request">20</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox21">
+                <property name="name">red</property>
+                <property name="width_request">40</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEventBox" id="eventbox22">
+                <property name="name">green</property>
+                <property name="width_request">40</property>
+                <property name="height_request">30</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>